merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:35:02 +0000 (16:35 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:35:02 +0000 (16:35 +0900)
commit1f55e0169c585eb109e30c1bde59aa27c41dae8d
tree10496b63d940f5f045f541790b85a4187df45262
parent3bd9c7b38e66134ca537bd85dc23654d14e7b830
parent40ce7b3f46255a73cac72ccbb1615e7a72f665ac
merge trunk